From: Kim F. Storm <storm@cua.dk>
Date: Mon, 3 May 2004 14:25:58 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22736
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ece588d12083c5fb0d73a9a45b8c653182ba5598;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef565ea0c89..8c62f23c8f0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,8 +4,9 @@
 
 2004-05-03  Kim F. Storm  <storm@cua.dk>
 
-	* emulation/cua-base.el (cua--update-indications): Fix last
-	change.
+	* emulation/cua-base.el (cua--update-indications):
+	Fix last change.
+	(cua-mode): Deactivate mark when cua-mode is enabled.
 
 2004-05-02  Luc Teirlinck  <teirllm@auburn.edu>